cellrendererpixbuf: Follow state even when insensitive
authorBenjamin Otte <otte@redhat.com>
Thu, 5 Sep 2013 16:42:53 +0000 (18:42 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 5 Sep 2013 16:48:47 +0000 (18:48 +0200)
gtk/gtkcellrendererpixbuf.c

index ee1c068dad78700e1463fd56501838115035f674..1ae79950e1e021133ee4a195a5854e8b384206ac 100644 (file)
@@ -533,11 +533,11 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
 
   state = GTK_STATE_FLAG_NORMAL;
 
-  if (!gtk_widget_get_sensitive (widget) ||
+  if (priv->follow_state)
+    state = gtk_cell_renderer_get_state (cell, widget, flags);
+  else if (!gtk_widget_get_sensitive (widget) ||
       !gtk_cell_renderer_get_sensitive (cell))
     state |= GTK_STATE_FLAG_INSENSITIVE;
-  else if (priv->follow_state)
-    state = gtk_cell_renderer_get_state (cell, widget, flags);
 
   gtk_style_context_set_state (context, state);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_IMAGE);